From 6ca54e06021e39698b0234a090e43275529c1df9 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Thu, 11 Dec 2014 18:04:34 -0800
Subject: [PATCH] Upgrade rust-installer to v2

---
 Makefile.in        | 4 +++-
 src/rust-installer | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index fd03484a0..049a0929b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -178,7 +178,9 @@ $$(DISTDIR_$(1))/$$(PKG_NAME)-$(1).tar.gz: prepare-image-$(1)
 		--work-dir=./$$(DISTDIR_$(1)) \
 		--output-dir=./$$(DISTDIR_$(1)) \
 		--non-installed-prefixes=$$(NON_INSTALLED_PREFIXES) \
-		--package-name=$$(PKG_NAME)-$(1)
+		--package-name=$$(PKG_NAME)-$(1) \
+		--component-name=cargo \
+		--legacy-manifest-dirs=rustlib,cargo
 	rm -Rf $$(IMGDIR_$(1))
 
 install-$(1): $$(DISTDIR_$(1))/$$(PKG_NAME)-$(1).tar.gz
diff --git a/src/rust-installer b/src/rust-installer
index aed734724..3a3798174 160000
--- a/src/rust-installer
+++ b/src/rust-installer
@@ -1 +1 @@
-Subproject commit aed73472416064642911af790b25d57c9390b6c7
+Subproject commit 3a37981744a5af2433fed551f742465c78c9af7f
-- 
2.30.2